From 2c5a4a24249e262fab41ac3b68bc9f3d6f63edbc Mon Sep 17 00:00:00 2001 From: oliskoli Date: Mon, 12 Dec 2005 21:45:50 +0000 Subject: [PATCH] Changed "Carto Explorer" to "Carto Exploreur" (cartoexplorer to cartoexploreur). Check this option in pcx_route_hdr too. --- gpsbabel/pcx.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/gpsbabel/pcx.c b/gpsbabel/pcx.c index e6eb11e64..d0b324923 100644 --- a/gpsbabel/pcx.c +++ b/gpsbabel/pcx.c @@ -39,8 +39,8 @@ static arglist_t pcx_args[] = { {"deficon", &deficon, "Default icon name", "Waypoint", ARGTYPE_STRING }, - {"cartoexplorer", &cartoexplorer, - "Write tracks compatible with CartoExplorer", "", + {"cartoexploreur", &cartoexploreur, + "Write tracks compatible with Carto Exploreur", "", ARGTYPE_BOOL }, {0, 0, 0, 0, 0} }; @@ -272,10 +272,10 @@ pcx_track_hdr(const route_head *trk) snprintf(buff, sizeof(buff)-1, "Trk%03d", route_ctr); name = mkshort(mkshort_handle2, (trk->rte_name != NULL) ? trk->rte_name : buff); - /* Cartoexplorer (popular in France) chokes on trackname headers, + /* Carto Exploreur (popular in France) chokes on trackname headers, * so provide option to supppress these. */ - if (!cartoexplorer) { + if (!cartoexploreur) { fprintf(file_out, "\n\nH TN %s\n", name); } xfree(name); @@ -292,8 +292,11 @@ pcx_route_hdr(const route_head *rte) snprintf(buff, sizeof(buff)-1, "Rte%03d", route_ctr); name = mkshort(mkshort_handle2, (rte->rte_name != NULL) ? rte->rte_name : buff); - - fprintf(file_out, "\n\nR %s\n", name); + + /* see pcx_track_hdr */ + if (!cartoexploreur) { + fprintf(file_out, "\n\nR %s\n", name); + } fprintf(file_out, "\n" "H IDNT LATITUDE LONGITUDE DATE TIME ALT DESCRIPTION PROXIMITY SYMBOL ;waypts\n"); } -- 2.30.2